refactor ipsec function #4334
Merged
refactor ipsec function #4334
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
changluyi
force-pushed
the
ipsec_refactor2
branch
from
9b0984d
to
094e677
Compare
|
Could you please add an e2e test case for this feature? I'm working on security: run as non-root user, which may break this function. |
e2e case will be added |
changluyi
force-pushed
the
ipsec_refactor2
branch
2 times, most recently
from
8834515
to
bd106fe
Compare
zhangzujian
reviewed
Jul 31, 2024
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
changluyi
force-pushed
the
ipsec_refactor2
branch
from
f854bcd
to
9ee1ee5
Compare
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
Signed-off-by: clyi <[email protected]>
oilbeater
requested changes
Aug 2, 2024
| updateBanpQueue workqueue.RateLimitingInterface | ||
| deleteBanpQueue workqueue.RateLimitingInterface | ||
| banpKeyMutex keymutex.KeyMutex | ||
| csrLister certListerv1.CertificateSigningRequestLister |
There was a problem hiding this comment.
need a empty line to separate.
Signed-off-by: clyi <[email protected]>
oilbeater
approved these changes
Aug 12, 2024
zcq98
pushed a commit
to zcq98/kube-ovn
that referenced
this pull request
Aug 12, 2024
refactor ovn ipsec function Signed-off-by: clyi <[email protected]>
bobz965
reviewed
Aug 12, 2024
| // From this, point we are dealing with an approved CSR | ||
| // Get CA in from ovn-ipsec-ca | ||
| caSecret, err := c.config.KubeClient.CoreV1().Secrets("kube-system").Get(context.TODO(), util.DefaultOVNIPSecCA, metav1.GetOptions{}) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| // Decode the certificate request from PEM format. | ||
| certReq, err := decodeCertificateRequest(csr.Spec.Request) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| // Decode the CA certificate from PEM format. | ||
| caCert, err := decodeCertificate(caSecret.Data["cacert"]) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
| } | ||
|
|
||
| caKey, err := decodePrivateKey(caSecret.Data["cakey"]) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
| // Create a new certificate using the certificate template and certificate. | ||
| // We can then sign this using the CA. | ||
| signedCert, err := signCSR(newCertificateTemplate(certReq), certReq.PublicKey, caCert, caKey) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| // Encode the certificate into PEM format and add to the status of the CSR | ||
| csr.Status.Certificate, err = encodeCertificates(signedCert) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
| return nil | ||
| } | ||
|
|
||
| if err := c.updateCsrStatus(csr); err != nil { |
bobz965
reviewed
Aug 12, 2024
| Message: message, | ||
| }) | ||
|
|
||
| if err := c.updateCsrStatus(csr); err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| func newCertificateTemplate(certReq *x509.CertificateRequest) *x509.Certificate { | ||
| serialNumber, err := rand.Int(rand.Reader, big.NewInt(1<<62)) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| func signCSR(template *x509.Certificate, requestKey c.PublicKey, issuer *x509.Certificate, issuerKey c.PrivateKey) (*x509.Certificate, error) { | ||
| derBytes, err := x509.CreateCertificate(rand.Reader, template, issuer, requestKey, issuerKey) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
| return nil, err | ||
| } | ||
| certs, err := x509.ParseCertificates(derBytes) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
|
|
||
| func decodeCertificateRequest(pemBytes []byte) (*x509.CertificateRequest, error) { | ||
| block, _ := pem.Decode(pemBytes) | ||
| if block == nil || block.Type != "CERTIFICATE REQUEST" { |
bobz965
reviewed
Aug 12, 2024
| func decodeCertificate(pemBytes []byte) (*x509.Certificate, error) { | ||
| block, _ := pem.Decode(pemBytes) | ||
| if block == nil || block.Type != "CERTIFICATE" { | ||
| err := errors.New("PEM block type must be CERTIFICATE") |
bobz965
reviewed
Aug 12, 2024
| func decodePrivateKey(pemBytes []byte) (*rsa.PrivateKey, error) { | ||
| block, _ := pem.Decode(pemBytes) | ||
| if block == nil || block.Type != "PRIVATE KEY" { | ||
| fmt.Println(block.Type) |
bobz965
reviewed
Aug 12, 2024
| } | ||
|
|
||
| key, err := x509.ParsePKCS8PrivateKey(block.Bytes) | ||
| if err != nil { |
bobz965
reviewed
Aug 12, 2024
| func encodeCertificates(certs ...*x509.Certificate) ([]byte, error) { | ||
| b := bytes.Buffer{} | ||
| for _, cert := range certs { | ||
| if err := pem.Encode(&b, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw}); err != nil { |
bobz965
reviewed
Aug 12, 2024
| func getOVSSystemID() (string, error) { | ||
| cmd := exec.Command("ovs-vsctl", "--retry", "-t", "60", "get", "Open_vSwitch", ".", "external-ids:system-id") | ||
| output, err := cmd.Output() | ||
| if err != nil { |
|
|
||
| func checkCertExpired() (bool, error) { | ||
| certBytes, err := os.ReadFile(ipsecCertPath) | ||
| if err != nil { |
| } | ||
|
|
||
| cert, err := x509.ParseCertificate(block.Bytes) | ||
| if err != nil { |
|
|
||
| func generateCSRCode() ([]byte, error) { | ||
| cn, err := getOVSSystemID() | ||
| if err != nil { |
| klog.Infof("ovs system id: %s", cn) | ||
| cmd := exec.Command("openssl", "genrsa", "-out", ipsecPrivKeyPath, "2048") | ||
| err = cmd.Run() | ||
| if err != nil { |
|
|
||
| func linkCACertToIPSecDir() error { | ||
| cmd := exec.Command("ln", "-s", ipsecCACertPath, "/etc/ipsec.d/cacerts/") | ||
| if err := cmd.Run(); err != nil { |
| func clearCACertToIPSecDir() error { | ||
| // clear /etc/openvswitch/keys/ipsec-cacert.pem | ||
| cmd := exec.Command("rm", "-f", "/etc/openvswitch/keys/ipsec-cacert.pem") | ||
| if err := cmd.Run(); err != nil { |
| } | ||
|
|
||
| func initIPSecKeysDir() error { | ||
| if err := os.MkdirAll(ipsecKeyDir, 0o755); err != nil { |
| } | ||
|
|
||
| func clearIPSecKeysDir() error { | ||
| if err := os.Remove(ipsecPrivKeyPath); err != nil && !os.IsNotExist(err) { |
| } | ||
| } else { | ||
| checkCertExpired, err := checkCertExpired() | ||
| if err != nil { |
|
@changluyi 大佬，我感觉有些err log 还是就近打印更好些，后面有空麻烦补充下 |
|
好的 我有空加下 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
What type of this PR
Examples of user facing changes:
Features
Bug fixes
Docs
Tests
Which issue(s) this PR fixes
Fixes #(issue-number)